Home Explore Help
Register Sign In
J1X
/
huginn
Watch 2
Star 0
Fork 0

Browse Source
Update gems and configs to Rails5

Dominik Sander 9 years ago
parent
7e79d576b5
commit
5fbeb105b2
17 changed files with 221 additions and 183 deletions
Show Diff Stats
  1. 5 6
      .travis.yml
  2. 17 15
      Gemfile
  3. 118 122
      Gemfile.lock
  4. 1 1
      Rakefile
  5. 3 3
      app/controllers/application_controller.rb
  6. 1 1
      bin/rails
  7. 1 1
      config.ru
  8. 1 1
      config/application.rb
  9. 1 1
      config/boot.rb
  10. 1 4
      config/environment.rb
  11. 23 11
      config/environments/development.rb
  12. 8 11
      config/environments/production.rb
  13. 5 5
      config/environments/test.rb
  14. 5 0
      config/initializers/cookies_serializer.rb
  15. 24 0
      config/initializers/new_framework_defaults.rb
  16. 1 1
      config/initializers/wrap_parameters.rb
  17. 6 0
      config/spring.rb

+ 5 - 6
.travis.yml
View File 

@@ -24,18 +24,17 @@ matrix:
24 24 
     - env: DOCKER_IMAGE=cantino/huginn DOCKERFILE=docker/multi-process/Dockerfile
25 25 
     - env: RSPEC_TASK=spec:features
26 26 
   include:
27 
-    - rvm: 2.3.0
27 
+    - rvm: 2.3.1
28 28 
       env: DATABASE_ADAPTER=mysql2 DOCKER_IMAGE=cantino/huginn-single-process DOCKERFILE=docker/single-process/Dockerfile
29 
-    - rvm: 2.3.0
29 
+    - rvm: 2.3.1
30 30 
       env: DATABASE_ADAPTER=mysql2 DOCKER_IMAGE=cantino/huginn DOCKERFILE=docker/multi-process/Dockerfile
31 
-    - rvm: 2.3.0
31 
+    - rvm: 2.3.1
32 32 
       env: RSPEC_TASK=spec:features DATABASE_ADAPTER=mysql2
33 
-    - rvm: 2.3.0
33 
+    - rvm: 2.3.1
34 34 
       env: RSPEC_TASK=spec:features DATABASE_ADAPTER=postgresql DATABASE_USERNAME=postgres
35 35 
 rvm:
36 
-- 2.1
37 36 
 - 2.2
38 
-- 2.3.0
37 
+- 2.3.1
39 38 
 cache: bundler
40 39 
 bundler_args: --without development production
41 40 
 before_install:

+ 17 - 15
Gemfile
View File 

@@ -38,7 +38,8 @@ gem 'slack-notifier', '~> 1.0.0'  # SlackAgent
38 38 
 gem 'hypdf', '~> 1.0.10'          # PDFInfoAgent
39 39
40 40 
 # Weibo Agents
41 
-gem 'weibo_2', github: 'cantino/weibo_2', branch: 'master'
41 
+# FIXME needs to loosen omniauth dependency
42 
+#gem 'weibo_2', github: 'cantino/weibo_2', branch: 'master'
42 43
43 44 
 # GoogleCalendarPublishAgent
44 45 
 gem "google-api-client", require: 'google/api_client'
 
@@ -46,11 +47,11 @@ gem "google-api-client", require: 'google/api_client'
46 47 
 # Twitter Agents
47 48 
 gem 'twitter', '~> 5.14.0' # Must to be loaded before cantino-twitter-stream.
48 49 
 gem 'twitter-stream', github: 'cantino/twitter-stream', branch: 'huginn'
49 
-gem 'omniauth-twitter'
50 
+gem 'omniauth-twitter', '~> 1.2.1'
50 51
51 52 
 # Tumblr Agents
52 53 
 gem 'tumblr_client', github: 'tumblr/tumblr_client', branch: 'master'  # '>= 0.8.5'
53 
-gem 'omniauth-tumblr'
54 
+gem 'omniauth-tumblr', '~> 1.2'
54 55
55 56 
 # Dropbox Agents
56 57 
 gem 'dropbox-api'
 
@@ -71,7 +72,7 @@ gem 'aws-sdk-core', '~> 2.2.15'
71 72
72 73 
 # Optional Services.
73 74 
 gem 'omniauth-37signals'          # BasecampAgent
74 
-gem 'omniauth-wunderlist', github: 'wunderlist/omniauth-wunderlist', ref: 'd0910d0396107b9302aa1bc50e74bb140990ccb8'
75 
+gem 'omniauth-wunderlist'
75 76
76 77 
 # Bundler <1.5 does not recognize :x64_mingw as a valid platform name.
77 78 
 # Unfortunately, it can't self-update because it errors when encountering :x64_mingw.
 
@@ -83,11 +84,11 @@ end
83 84 
 gem 'ace-rails-ap', '~> 2.0.1'
84 85 
 gem 'bootstrap-kaminari-views', '~> 0.0.3'
85 86 
 gem 'bundler', '>= 1.5.0'
86 
-gem 'coffee-rails', '~> 4.1.1'
87 
+gem 'coffee-rails', '~> 4.2'
87 88 
 gem 'daemons', '~> 1.1.9'
88 89 
 gem 'delayed_job', '~> 4.1.0'
89 90 
 gem 'delayed_job_active_record', github: 'collectiveidea/delayed_job_active_record', branch: 'master'
90 
-gem 'devise', '~> 3.5.4'
91 
+gem 'devise','~> 4.2.0'
91 92 
 gem 'em-http-request', '~> 1.1.2'
92 93 
 gem 'faraday', '~> 0.9.0'
93 94 
 gem 'faraday_middleware', github: 'lostisland/faraday_middleware', branch: 'master'  # '>= 0.10.1'
 
@@ -100,7 +101,7 @@ gem 'geokit', '~> 1.8.4'
100 101 
 gem 'geokit-rails', '~> 2.0.1'
101 102 
 gem 'httparty', '~> 0.13'
102 103 
 gem 'httmultiparty', '~> 0.3.16'
103 
-gem 'jquery-rails', '~> 3.1.3'
104 
+gem 'jquery-rails', '~> 4.2.1'
104 105 
 gem 'huginn_agent', '~> 0.4.0'
105 106 
 gem 'json', '~> 1.8.1'
106 107 
 gem 'jsonpathv2', '~> 0.0.8'
 
@@ -110,8 +111,8 @@ gem 'liquid', '~> 3.0.3'
110 111 
 gem 'mini_magick'
111 112 
 gem 'multi_xml'
112 113 
 gem 'nokogiri', '1.6.8'
113 
-gem 'omniauth'
114 
-gem 'rails', '4.2.7.1'
114 
+gem 'omniauth', '~> 1.3.1'
115 
+gem 'rails', '~> 5.0.0.1'
115 116 
 gem 'rufus-scheduler', '~> 3.0.8', require: false
116 117 
 gem 'sass-rails',   '~> 5.0.6'
117 118 
 gem 'select2-rails', '~> 3.5.4'
 
@@ -124,12 +125,12 @@ gem 'uglifier', '~> 2.7.2'
124 125 
 group :development do
125 126 
   gem 'better_errors', '~> 1.1'
126 127 
   gem 'binding_of_caller'
127 
-  gem 'quiet_assets'
128 128 
   gem 'guard', '~> 2.13.0'
129 129 
   gem 'guard-livereload', '~> 2.5.1'
130 130 
   gem 'guard-rspec', '~> 4.6.4'
131 131 
   gem 'rack-livereload', '~> 0.3.16'
132 
-  gem 'letter_opener_web'
132 
+  gem 'letter_opener_web', '~> 1.3.0'
133 
+  gem 'web-console'
133 134
134 135 
   gem 'capistrano', '~> 3.4.0'
135 136 
   gem 'capistrano-rails', '~> 1.1'
 
@@ -138,6 +139,7 @@ group :development do
138 139 
   if_true(ENV['SPRING']) do
139 140 
     gem 'spring-commands-rspec', '~> 1.0.4'
140 141 
     gem 'spring', '~> 1.6.3'
142 
+    gem 'spring-watcher-listen', '~> 2.0.0'
141 143 
   end
142 144
143 145 
   group :test do
 
@@ -150,8 +152,9 @@ group :development do
150 152 
     gem 'rr'
151 153 
     gem 'rspec', '~> 3.5'
152 154 
     gem 'rspec-collection_matchers', '~> 1.1.0'
153 
-    gem 'rspec-rails', '~> 3.5.1'
154 
-    gem 'rspec-html-matchers', '~> 0.7'
155 
+    gem 'rspec-rails', '~> 3.5.2'
156 
+    gem 'rspec-html-matchers', '~> 0.8'
157 
+    gem 'rails-controller-testing'
155 158 
     gem 'shoulda-matchers'
156 159 
     gem 'vcr'
157 160 
     gem 'webmock', '~> 1.17.4', require: false
 
@@ -160,8 +163,7 @@ group :development do
160 163 
 end
161 164
162 165 
 group :production do
163 
-  gem 'rack', '> 1.5.0'
164 
-  gem 'unicorn', '~> 4.9.0'
166 
+  gem 'unicorn', '~> 5.1.0'
165 167 
 end
166 168
167 169 
 # Platform requirements.

+ 118 - 122
Gemfile.lock
View File 

@@ -9,22 +9,11 @@ GIT
9 9 
       simple_oauth (~> 0.3.0)
10 10
11 11 
 GIT
12 
-  remote: git://github.com/cantino/weibo_2.git
13 
-  revision: 00e57d29d8252126014b038cd738b02e05e4cfc5
14 
-  branch: master
15 
-  specs:
16 
-    weibo_2 (0.1.7)
17 
-      hashie (~> 2.0.4)
18 
-      multi_json (~> 1)
19 
-      oauth2 (~> 0.9.1)
20 
-      rest-client (~> 1.8)
21 
-
22 
-GIT
23 12 
   remote: git://github.com/collectiveidea/delayed_job_active_record.git
24 
-  revision: 61e688e03b2ef4004b08de6d1e0a123fda8fffad
13 
+  revision: 36f434c4fd660e8f11ce932be117e9c71dde7212
25 14 
   branch: master
26 15 
   specs:
27 
-    delayed_job_active_record (4.1.0)
16 
+    delayed_job_active_record (4.1.1)
28 17 
       activerecord (>= 3.0, < 5.1)
29 18 
       delayed_job (>= 3.0, < 5)
30 19 
 
@@ -49,15 +38,6 @@ GIT
49 38 
       oauth
50 39 
       simple_oauth
51 40
52 
-GIT
53 
-  remote: git://github.com/wunderlist/omniauth-wunderlist.git
54 
-  revision: d0910d0396107b9302aa1bc50e74bb140990ccb8
55 
-  ref: d0910d0396107b9302aa1bc50e74bb140990ccb8
56 
-  specs:
57 
-    omniauth-wunderlist (0.0.1)
58 
-      omniauth (~> 1.0)
59 
-      omniauth-oauth2 (~> 1.1)
60 
-
61 41 
 PATH
62 42 
   remote: vendor/gems/dotenv-2.0.1
63 43 
   specs:
 
@@ -69,50 +49,52 @@ GEM
69 49 
   remote: https://rubygems.org/
70 50 
   specs:
71 51 
     ace-rails-ap (2.0.1)
72 
-    actionmailer (4.2.7.1)
73 
-      actionpack (= 4.2.7.1)
74 
-      actionview (= 4.2.7.1)
75 
-      activejob (= 4.2.7.1)
52 
+    actioncable (5.0.0.1)
53 
+      actionpack (= 5.0.0.1)
54 
+      nio4r (~> 1.2)
55 
+      websocket-driver (~> 0.6.1)
56 
+    actionmailer (5.0.0.1)
57 
+      actionpack (= 5.0.0.1)
58 
+      actionview (= 5.0.0.1)
59 
+      activejob (= 5.0.0.1)
76 60 
       mail (~> 2.5, >= 2.5.4)
77 
-      rails-dom-testing (~> 1.0, >= 1.0.5)
78 
-    actionpack (4.2.7.1)
79 
-      actionview (= 4.2.7.1)
80 
-      activesupport (= 4.2.7.1)
81 
-      rack (~> 1.6)
82 
-      rack-test (~> 0.6.2)
83 
-      rails-dom-testing (~> 1.0, >= 1.0.5)
61 
+      rails-dom-testing (~> 2.0)
62 
+    actionpack (5.0.0.1)
63 
+      actionview (= 5.0.0.1)
64 
+      activesupport (= 5.0.0.1)
65 
+      rack (~> 2.0)
66 
+      rack-test (~> 0.6.3)
67 
+      rails-dom-testing (~> 2.0)
84 68 
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
85 
-    actionview (4.2.7.1)
86 
-      activesupport (= 4.2.7.1)
69 
+    actionview (5.0.0.1)
70 
+      activesupport (= 5.0.0.1)
87 71 
       builder (~> 3.1)
88 72 
       erubis (~> 2.7.0)
89 
-      rails-dom-testing (~> 1.0, >= 1.0.5)
73 
+      rails-dom-testing (~> 2.0)
90 74 
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
91 
-    activejob (4.2.7.1)
92 
-      activesupport (= 4.2.7.1)
93 
-      globalid (>= 0.3.0)
94 
-    activemodel (4.2.7.1)
95 
-      activesupport (= 4.2.7.1)
96 
-      builder (~> 3.1)
97 
-    activerecord (4.2.7.1)
98 
-      activemodel (= 4.2.7.1)
99 
-      activesupport (= 4.2.7.1)
100 
-      arel (~> 6.0)
101 
-    activesupport (4.2.7.1)
75 
+    activejob (5.0.0.1)
76 
+      activesupport (= 5.0.0.1)
77 
+      globalid (>= 0.3.6)
78 
+    activemodel (5.0.0.1)
79 
+      activesupport (= 5.0.0.1)
80 
+    activerecord (5.0.0.1)
81 
+      activemodel (= 5.0.0.1)
82 
+      activesupport (= 5.0.0.1)
83 
+      arel (~> 7.0)
84 
+    activesupport (5.0.0.1)
85 
+      concurrent-ruby (~> 1.0, >= 1.0.2)
102 86 
       i18n (~> 0.7)
103 
-      json (~> 1.7, >= 1.7.7)
104 87 
       minitest (~> 5.1)
105 
-      thread_safe (~> 0.3, >= 0.3.4)
106 88 
       tzinfo (~> 1.1)
107 89 
     addressable (2.3.8)
108 
-    arel (6.0.3)
90 
+    arel (7.1.1)
109 91 
     autoparse (0.3.3)
110 92 
       addressable (>= 2.3.1)
111 93 
       extlib (>= 0.9.15)
112 94 
       multi_json (>= 1.0.0)
113 95 
     aws-sdk-core (2.2.15)
114 96 
       jmespath (~> 1.0)
115 
-    bcrypt (3.1.10)
97 
+    bcrypt (3.1.11)
116 98 
     better_errors (1.1.0)
117 99 
       coderay (>= 1.0.0)
118 100 
       erubis (>= 2.6.6)
 
@@ -147,9 +129,9 @@ GEM
147 129 
     chronic (0.10.2)
148 130 
     cliver (0.3.2)
149 131 
     coderay (1.1.0)
150 
-    coffee-rails (4.1.1)
132 
+    coffee-rails (4.2.1)
151 133 
       coffee-script (>= 2.2.0)
152 
-      railties (>= 4.0.0, < 5.1.x)
134 
+      railties (>= 4.0.0, < 5.2.x)
153 135 
     coffee-script (2.4.1)
154 136 
       coffee-script-source
155 137 
       execjs
 
@@ -168,16 +150,15 @@ GEM
168 150 
     daemons (1.1.9)
169 151 
     database_cleaner (1.5.3)
170 152 
     debug_inspector (0.0.2)
171 
-    delayed_job (4.1.1)
172 
-      activesupport (>= 3.0, < 5.0)
153 
+    delayed_job (4.1.2)
154 
+      activesupport (>= 3.0, < 5.1)
173 155 
     delorean (2.1.0)
174 156 
       chronic
175 
-    devise (3.5.4)
157 
+    devise (4.2.0)
176 158 
       bcrypt (~> 3.0)
177 159 
       orm_adapter (~> 0.1)
178 
-      railties (>= 3.2.6, < 5)
160 
+      railties (>= 4.1.0, < 5.1)
179 161 
       responders
180 
-      thread_safe (~> 0.1)
181 162 
       warden (~> 1.2.3)
182 163 
     diff-lcs (1.2.5)
183 164 
     docile (1.1.5)
 
@@ -260,11 +241,11 @@ GEM
260 241 
       guard (~> 2.8)
261 242 
       guard-compat (~> 1.0)
262 243 
       multi_json (~> 1.8)
263 
-    guard-rspec (4.6.4)
244 
+    guard-rspec (4.6.5)
264 245 
       guard (~> 2.1)
265 246 
       guard-compat (~> 1.1)
266 247 
       rspec (>= 2.99.0, < 4.0)
267 
-    hashie (2.0.5)
248 
+    hashie (3.4.4)
268 249 
     haversine (0.3.0)
269 250 
     hipchat (1.2.0)
270 251 
       httparty
 
@@ -288,8 +269,9 @@ GEM
288 269 
       httparty (~> 0.13)
289 270 
     i18n (0.7.0)
290 271 
     jmespath (1.1.3)
291 
-    jquery-rails (3.1.3)
292 
-      railties (>= 3.0, < 5.0)
272 
+    jquery-rails (4.2.1)
273 
+      rails-dom-testing (>= 1, < 3)
274 
+      railties (>= 4.2.0)
293 275 
       thor (>= 0.14, < 2.0)
294 276 
     json (1.8.3)
295 277 
     jsonpathv2 (0.0.8)
 
@@ -298,7 +280,7 @@ GEM
298 280 
     kaminari (0.16.1)
299 281 
       actionpack (>= 3.0.0)
300 282 
       activesupport (>= 3.0.0)
301 
-    kgio (2.9.3)
283 
+    kgio (2.10.0)
302 284 
     kramdown (1.3.3)
303 285 
     launchy (2.4.2)
304 286 
       addressable (~> 2.3)
 
@@ -323,7 +305,7 @@ GEM
323 305 
     memoizable (0.4.2)
324 306 
       thread_safe (~> 0.3, >= 0.3.1)
325 307 
     method_source (0.8.2)
326 
-    mime-types (2.99.2)
308 
+    mime-types (2.99.3)
327 309 
     mimemagic (0.3.1)
328 310 
     mini_magick (4.2.3)
329 311 
     mini_portile2 (2.1.0)
 
@@ -340,6 +322,7 @@ GEM
340 322 
       net-ssh (>= 2.6.5)
341 323 
     net-ssh (3.0.2)
342 324 
     netrc (0.10.3)
325 
+    nio4r (1.2.1)
343 326 
     nokogiri (1.6.8)
344 327 
       mini_portile2 (~> 2.1.0)
345 328 
       pkg-config (~> 1.1.7)
 
@@ -347,15 +330,15 @@ GEM
347 330 
       nenv (~> 0.1)
348 331 
       shellany (~> 0.0)
349 332 
     oauth (0.4.7)
350 
-    oauth2 (0.9.4)
333 
+    oauth2 (1.2.0)
351 334 
       faraday (>= 0.8, < 0.10)
352 335 
       jwt (~> 1.0)
353 336 
       multi_json (~> 1.3)
354 337 
       multi_xml (~> 0.5)
355 
-      rack (~> 1.2)
356 
-    omniauth (1.2.2)
338 
+      rack (>= 1.2, < 3)
339 
+    omniauth (1.3.1)
357 340 
       hashie (>= 1.2, < 4)
358 
-      rack (~> 1.0)
341 
+      rack (>= 1.0, < 3)
359 342 
     omniauth-37signals (1.0.5)
360 343 
       omniauth (~> 1.0)
361 344 
       omniauth-oauth2 (~> 1.0)
 
@@ -365,19 +348,21 @@ GEM
365 348 
       evernote-thrift
366 349 
       multi_json (~> 1.0)
367 350 
       omniauth-oauth (~> 1.0)
368 
-    omniauth-oauth (1.0.1)
351 
+    omniauth-oauth (1.1.0)
369 352 
       oauth
370 353 
       omniauth (~> 1.0)
371 
-    omniauth-oauth2 (1.1.2)
372 
-      faraday (>= 0.8, < 0.10)
373 
-      multi_json (~> 1.3)
374 
-      oauth2 (~> 0.9.3)
354 
+    omniauth-oauth2 (1.3.1)
355 
+      oauth2 (~> 1.0)
375 356 
       omniauth (~> 1.2)
376 
-    omniauth-tumblr (1.1)
377 
-      omniauth-oauth (~> 1.0)
378 
-    omniauth-twitter (1.0.1)
379 
-      multi_json (~> 1.3)
357 
+    omniauth-tumblr (1.2)
358 
+      multi_json
380 359 
       omniauth-oauth (~> 1.0)
360 
+    omniauth-twitter (1.2.1)
361 
+      json (~> 1.3)
362 
+      omniauth-oauth (~> 1.1)
363 
+    omniauth-wunderlist (0.0.2)
364 
+      omniauth (~> 1.0)
365 
+      omniauth-oauth2 (~> 1.1)
381 366 
     orm_adapter (0.5.0)
382 367 
     pg (0.18.3)
383 368 
     pkg-config (1.1.7)
 
@@ -396,30 +381,30 @@ GEM
396 381 
       pry (~> 0.10)
397 382 
     pry-rails (0.3.4)
398 383 
       pry (>= 0.9.10)
399 
-    quiet_assets (1.1.0)
400 
-      railties (>= 3.1, < 5.0)
401 
-    rack (1.6.4)
384 
+    rack (2.0.1)
402 385 
     rack-livereload (0.3.16)
403 386 
       rack
404 387 
     rack-test (0.6.3)
405 388 
       rack (>= 1.0)
406 
-    rails (4.2.7.1)
407 
-      actionmailer (= 4.2.7.1)
408 
-      actionpack (= 4.2.7.1)
409 
-      actionview (= 4.2.7.1)
410 
-      activejob (= 4.2.7.1)
411 
-      activemodel (= 4.2.7.1)
412 
-      activerecord (= 4.2.7.1)
413 
-      activesupport (= 4.2.7.1)
389 
+    rails (5.0.0.1)
390 
+      actioncable (= 5.0.0.1)
391 
+      actionmailer (= 5.0.0.1)
392 
+      actionpack (= 5.0.0.1)
393 
+      actionview (= 5.0.0.1)
394 
+      activejob (= 5.0.0.1)
395 
+      activemodel (= 5.0.0.1)
396 
+      activerecord (= 5.0.0.1)
397 
+      activesupport (= 5.0.0.1)
414 398 
       bundler (>= 1.3.0, < 2.0)
415 
-      railties (= 4.2.7.1)
416 
-      sprockets-rails
417 
-    rails-deprecated_sanitizer (1.0.3)
418 
-      activesupport (>= 4.2.0.alpha)
419 
-    rails-dom-testing (1.0.7)
420 
-      activesupport (>= 4.2.0.beta, < 5.0)
399 
+      railties (= 5.0.0.1)
400 
+      sprockets-rails (>= 2.0.0)
401 
+    rails-controller-testing (1.0.1)
402 
+      actionpack (~> 5.x)
403 
+      actionview (~> 5.x)
404 
+      activesupport (~> 5.x)
405 
+    rails-dom-testing (2.0.1)
406 
+      activesupport (>= 4.2.0, < 6.0)
421 407 
       nokogiri (~> 1.6.0)
422 
-      rails-deprecated_sanitizer (>= 1.0.1)
423 408 
     rails-html-sanitizer (1.0.3)
424 409 
       loofah (~> 2.0)
425 410 
     rails_12factor (0.0.3)
 
@@ -427,18 +412,19 @@ GEM
427 412 
       rails_stdout_logging
428 413 
     rails_serve_static_assets (0.0.4)
429 414 
     rails_stdout_logging (0.0.3)
430 
-    railties (4.2.7.1)
431 
-      actionpack (= 4.2.7.1)
432 
-      activesupport (= 4.2.7.1)
415 
+    railties (5.0.0.1)
416 
+      actionpack (= 5.0.0.1)
417 
+      activesupport (= 5.0.0.1)
418 
+      method_source
433 419 
       rake (>= 0.8.7)
434 420 
       thor (>= 0.18.1, < 2.0)
435 
-    raindrops (0.13.0)
421 
+    raindrops (0.17.0)
436 422 
     rake (11.2.2)
437 423 
     rb-fsevent (0.9.7)
438 424 
     rb-inotify (0.9.5)
439 425 
       ffi (>= 0.5.0)
440 426 
     ref (2.0.0)
441 
-    responders (2.1.1)
427 
+    responders (2.3.0)
442 428 
       railties (>= 4.2.0, < 5.1)
443 429 
     rest-client (1.8.0)
444 430 
       http-cookie (>= 1.0.2, < 2.0)
 
@@ -457,13 +443,13 @@ GEM
457 443 
     rspec-expectations (3.5.0)
458 444 
       diff-lcs (>= 1.2.0, < 2.0)
459 445 
       rspec-support (~> 3.5.0)
460 
-    rspec-html-matchers (0.7.0)
446 
+    rspec-html-matchers (0.8.1)
461 447 
       nokogiri (~> 1)
462 
-      rspec (~> 3)
448 
+      rspec (>= 3.0.0.a, < 4)
463 449 
     rspec-mocks (3.5.0)
464 450 
       diff-lcs (>= 1.2.0, < 2.0)
465 451 
       rspec-support (~> 3.5.0)
466 
-    rspec-rails (3.5.1)
452 
+    rspec-rails (3.5.2)
467 453 
       actionpack (>= 3.0)
468 454 
       activesupport (>= 3.0)
469 455 
       railties (>= 3.0)
 
@@ -512,10 +498,13 @@ GEM
512 498 
     spring (1.6.3)
513 499 
     spring-commands-rspec (1.0.4)
514 500 
       spring (>= 0.9.1)
501 
+    spring-watcher-listen (2.0.0)
502 
+      listen (>= 2.7, < 4.0)
503 
+      spring (~> 1.2)
515 504 
     sprockets (3.7.0)
516 505 
       concurrent-ruby (~> 1.0)
517 506 
       rack (> 1, < 3)
518 
-    sprockets-rails (3.1.1)
507 
+    sprockets-rails (3.2.0)
519 508 
       actionpack (>= 4.0)
520 509 
       activesupport (>= 4.0)
521 510 
       sprockets (>= 3.0.0)
 
@@ -561,16 +550,20 @@ GEM
561 550 
     unf (0.1.4)
562 551 
       unf_ext
563 552 
     unf_ext (0.0.7.1)
564 
-    unicorn (4.9.0)
553 
+    unicorn (5.1.0)
565 554 
       kgio (~> 2.6)
566 
-      rack
567 555 
       raindrops (~> 0.7)
568 556 
     uuid (2.3.7)
569 557 
       macaddr (~> 1.0)
570 558 
     uuidtools (2.1.5)
571 559 
     vcr (2.9.2)
572 
-    warden (1.2.4)
560 
+    warden (1.2.6)
573 561 
       rack (>= 1.0)
562 
+    web-console (3.3.1)
563 
+      actionview (>= 5.0)
564 
+      activemodel (>= 5.0)
565 
+      debug_inspector
566 
+      railties (>= 5.0)
574 567 
     webmock (1.17.4)
575 568 
       addressable (>= 2.2.7)
576 569 
       crack (>= 0.3.2)
 
@@ -599,14 +592,14 @@ DEPENDENCIES
599 592 
   capistrano-bundler (~> 1.1.4)
600 593 
   capistrano-rails (~> 1.1)
601 594 
   capybara-select2
602 
-  coffee-rails (~> 4.1.1)
595 
+  coffee-rails (~> 4.2)
603 596 
   coveralls (~> 0.7.4)
604 597 
   daemons (~> 1.1.9)
605 598 
   database_cleaner (~> 1.5.3)
606 599 
   delayed_job (~> 4.1.0)
607 600 
   delayed_job_active_record!
608 601 
   delorean
609 
-  devise (~> 3.5.4)
602 
+  devise (~> 4.2.0)
610 603 
   dotenv!
611 604 
   dotenv-rails!
612 605 
   dropbox-api
 
@@ -631,12 +624,12 @@ DEPENDENCIES
631 624 
   httparty (~> 0.13)
632 625 
   huginn_agent (~> 0.4.0)
633 626 
   hypdf (~> 1.0.10)
634 
-  jquery-rails (~> 3.1.3)
627 
+  jquery-rails (~> 4.2.1)
635 628 
   json (~> 1.8.1)
636 629 
   jsonpathv2 (~> 0.0.8)
637 630 
   kaminari (~> 0.16.1)
638 631 
   kramdown (~> 1.3.3)
639 
-  letter_opener_web
632 
+  letter_opener_web (~> 1.3.0)
640 633 
   liquid (~> 3.0.3)
641 634 
   listen (~> 3.0.5)
642 635 
   mini_magick
 
@@ -645,27 +638,26 @@ DEPENDENCIES
645 638 
   mysql2 (~> 0.3.20)
646 639 
   net-ftp-list (~> 3.2.8)
647 640 
   nokogiri (= 1.6.8)
648 
-  omniauth
641 
+  omniauth (~> 1.3.1)
649 642 
   omniauth-37signals
650 643 
   omniauth-dropbox
651 644 
   omniauth-evernote
652 
-  omniauth-tumblr
653 
-  omniauth-twitter
654 
-  omniauth-wunderlist!
645 
+  omniauth-tumblr (~> 1.2)
646 
+  omniauth-twitter (~> 1.2.1)
647 
+  omniauth-wunderlist
655 648 
   pg (~> 0.18.3)
656 649 
   poltergeist
657 650 
   pry-byebug
658 651 
   pry-rails
659 
-  quiet_assets
660 
-  rack (> 1.5.0)
661 652 
   rack-livereload (~> 0.3.16)
662 
-  rails (= 4.2.7.1)
653 
+  rails (~> 5.0.0.1)
654 
+  rails-controller-testing
663 655 
   rails_12factor
664 656 
   rr
665 657 
   rspec (~> 3.5)
666 658 
   rspec-collection_matchers (~> 1.1.0)
667 
-  rspec-html-matchers (~> 0.7)
668 
-  rspec-rails (~> 3.5.1)
659 
+  rspec-html-matchers (~> 0.8)
660 
+  rspec-rails (~> 3.5.2)
669 661 
   rturk (~> 2.12.1)
670 662 
   ruby-growl (~> 4.1.0)
671 663 
   rufus-scheduler (~> 3.0.8)
 
@@ -676,6 +668,7 @@ DEPENDENCIES
676 668 
   spectrum-rails
677 669 
   spring (~> 1.6.3)
678 670 
   spring-commands-rspec (~> 1.0.4)
671 
+  spring-watcher-listen (~> 2.0.0)
679 672 
   string-scrub
680 673 
   therubyracer (~> 0.12.2)
681 674 
   tumblr_client!
 
@@ -686,12 +679,15 @@ DEPENDENCIES
686 679 
   tzinfo (>= 1.2.0)
687 680 
   tzinfo-data
688 681 
   uglifier (~> 2.7.2)
689 
-  unicorn (~> 4.9.0)
682 
+  unicorn (~> 5.1.0)
690 683 
   vcr
684 
+  web-console
691 685 
   webmock (~> 1.17.4)
692 
-  weibo_2!
693 686 
   wunderground (~> 1.2.0)
694 687 
   xmpp4r (~> 0.5.6)
695 688
689 
+RUBY VERSION
690 
+   ruby 2.3.1p112
691 
+
696 692 
 BUNDLED WITH
697 693 
    1.12.5

+ 1 - 1
Rakefile
View File 

@@ -2,6 +2,6 @@
2 2 
 # Add your own tasks in files placed in lib/tasks ending in .rake,
3 3 
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
4 4
5 
-require File.expand_path('../config/application', __FILE__)
5 
+require_relative 'config/application'
6 6
7 7 
 Huginn::Application.load_tasks

+ 3 - 3
app/controllers/application_controller.rb
View File 

@@ -21,9 +21,9 @@ class ApplicationController < ActionController::Base
21 21 
   protected
22 22
23 23 
   def configure_permitted_parameters
24 
-    devise_parameter_sanitizer.for(:sign_up) { |u| u.permit(:username, :email, :password, :password_confirmation, :remember_me, :invitation_code) }
25 
-    devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:login, :username, :email, :password, :remember_me) }
26 
-    devise_parameter_sanitizer.for(:account_update) { |u| u.permit(:username, :email, :password, :password_confirmation, :current_password) }
24 
+    devise_parameter_sanitizer.permit(:sign_up, keys: [:username, :email, :password, :password_confirmation, :remember_me, :invitation_code])
25 
+    devise_parameter_sanitizer.permit(:sign_in, keys: [:login, :username, :email, :password, :remember_me])
26 
+    devise_parameter_sanitizer.permit(:account_update, keys: [:username, :email, :password, :password_confirmation, :current_password])
27 27 
   end
28 28
29 29 
   def authenticate_admin!

+ 1 - 1
bin/rails
View File 

@@ -4,6 +4,6 @@ begin
4 4 
 rescue LoadError => e
5 5 
   raise unless e.message.include?('spring')
6 6 
 end
7 
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
7 
+APP_PATH = File.expand_path('../config/application', __dir__)
8 8 
 require_relative '../config/boot'
9 9 
 require 'rails/commands'

+ 1 - 1
config.ru
View File 

@@ -1,5 +1,5 @@
1 1 
 # This file is used by Rack-based servers to start the application.
2 2
3 
-require ::File.expand_path('../config/environment',  __FILE__)
3 
+require_relative 'config/environment'
4 4
5 5 
 run Huginn::Application

+ 1 - 1
config/application.rb
View File 

@@ -1,4 +1,4 @@
1 
-require File.expand_path('../boot', __FILE__)
1 
+require_relative 'boot'
2 2
3 3 
 require 'rails/all'
4 4

+ 1 - 1
config/boot.rb
View File 

@@ -1,6 +1,6 @@
1 1 
 require 'rubygems'
2 2
3 3 
 # Set up gems listed in the Gemfile.
4 
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
4 
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
5 5
6 6 
 require 'bundler/setup' # Set up gems listed in the Gemfile.

+ 1 - 4
config/environment.rb
View File 

@@ -1,8 +1,5 @@
1 1 
 # Load the rails application
2 
-require File.expand_path('../application', __FILE__)
3 
-
4 
-# Remove the XML parser from the list that will be used to initialize the application's XML parser list.
5 
-ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)
2 
+require_relative 'application'
6 3
7 4 
 # Initialize the rails application
8 5 
 Huginn::Application.initialize!

+ 23 - 11
config/environments/development.rb
View File 

@@ -16,9 +16,22 @@ Huginn::Application.configure do
16 16 
   # Rake tasks automatically ignore this option for performance.
17 17 
   config.eager_load = false
18 18
19 
-  # Show full error reports and disable caching
20 
-  config.consider_all_requests_local       = true
21 
-  config.action_controller.perform_caching = false
19 
+  # Show full error reports.
20 
+  config.consider_all_requests_local = true
21 
+
22 
+  # Enable/disable caching. By default caching is disabled.
23 
+  if Rails.root.join('tmp/caching-dev.txt').exist?
24 
+    config.action_controller.perform_caching = true
25 
+
26 
+    config.cache_store = :memory_store
27 
+    config.public_file_server.headers = {
28 
+      'Cache-Control' => 'public, max-age=172800'
29 
+    }
30 
+  else
31 
+    config.action_controller.perform_caching = false
32 
+
33 
+    config.cache_store = :null_store
34 
+  end
22 35
23 36 
   # Print deprecation notices to the Rails logger
24 37 
   config.active_support.deprecation = :log
 
@@ -35,14 +48,8 @@ Huginn::Application.configure do
35 48 
   # Expands the lines which load the assets
36 49 
   config.assets.debug = true
37 50
38 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
39 
-  # yet still be able to expire them through the digest params.
40 
-  config.assets.digest = true
41 
-
42 
-  # Adds additional error checking when serving assets at runtime.
43 
-  # Checks for improperly declared sprockets dependencies.
44 
-  # Raises helpful error messages.
45 
-  config.assets.raise_runtime_errors = true
51 
+  # Suppress logger output for asset requests.
52 
+  config.assets.quiet = true
46 53
47 54 
   config.action_mailer.default_url_options = { :host => ENV['DOMAIN'] }
48 55 
   config.action_mailer.asset_host = ENV['DOMAIN']
 
@@ -52,5 +59,10 @@ Huginn::Application.configure do
52 59 
   else
53 60 
     config.action_mailer.delivery_method = :letter_opener_web
54 61 
   end
62 
+  config.action_mailer.perform_caching = false
55 63 
   # smtp_settings moved to config/initializers/action_mailer.rb
64 
+
65 
+  # Use an evented file watcher to asynchronously detect changes in source code,
66 
+  # routes, locales, etc. This feature depends on the listen gem.
67 
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
56 68 
 end

+ 8 - 11
config/environments/production.rb
View File 

@@ -14,15 +14,9 @@ Huginn::Application.configure do
14 14 
   config.consider_all_requests_local       = false
15 15 
   config.action_controller.perform_caching = true
16 16
17 
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
18 
-  # Add `rack-cache` to your Gemfile before enabling this.
19 
-  # For large-scale production use, consider using a caching reverse proxy like
20 
-  # NGINX, varnish or squid.
21 
-  # config.action_dispatch.rack_cache = true
22 
-
23 17 
   # Disable serving static files from the `/public` folder by default since
24 18 
   # Apache or NGINX already handles this.
25 
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
19 
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
26 20
27 21 
   # Compress JavaScripts and CSS
28 22 
   config.assets.js_compressor  = :uglifier
 
@@ -31,15 +25,17 @@ Huginn::Application.configure do
31 25 
   # Don't fallback to assets pipeline if a precompiled asset is missed
32 26 
   config.assets.compile = false
33 27
34 
-  # Generate digests for assets URLs
35 
-  config.assets.digest = true
36 
-
37 28 
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
38 29
39 30 
   # Specifies the header that your server uses for sending files.
40 31 
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
41 32 
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
42 33
34 
+  # Mount Action Cable outside main process or domain
35 
+  # config.action_cable.mount_path = nil
36 
+  # config.action_cable.url = 'wss://example.com/cable'
37 
+  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
38 
+
43 39 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
44 40 
   config.force_ssl = ENV['FORCE_SSL'] == 'true'
45 41 
 
@@ -47,7 +43,7 @@ Huginn::Application.configure do
47 43 
   config.log_level = :info
48 44
49 45 
   # Prepend all log lines with the following tags
50 
-  config.log_tags = [ :uuid ] # :subdomain
46 
+  config.log_tags = [ :request_id ] # :subdomain
51 47
52 48 
   # Use a different logger for distributed setups
53 49 
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
@@ -85,5 +81,6 @@ Huginn::Application.configure do
85 81 
   config.action_mailer.perform_deliveries = true
86 82 
   config.action_mailer.raise_delivery_errors = true
87 83 
   config.action_mailer.delivery_method = :smtp
84 
+  config.action_mailer.perform_caching = false
88 85 
   # smtp_settings moved to config/initializers/action_mailer.rb
89 86 
 end

+ 5 - 5
config/environments/test.rb
View File 

@@ -13,8 +13,10 @@ Huginn::Application.configure do
13 13 
   config.eager_load = false
14 14
15 15 
   # Configure static asset server for tests with Cache-Control for performance
16 
-  config.serve_static_files = true
17 
-  config.static_cache_control = "public, max-age=3600"
16 
+  config.public_file_server.enabled = true
17 
+  config.public_file_server.headers = {
18 
+    'Cache-Control' => 'public, max-age=3600'
19 
+  }
18 20
19 21 
   # Show full error reports and disable caching
20 22 
   config.consider_all_requests_local       = true
 
@@ -25,6 +27,7 @@ Huginn::Application.configure do
25 27
26 28 
   # Disable request forgery protection in test environment
27 29 
   config.action_controller.allow_forgery_protection = false
30 
+  config.action_mailer.perform_caching = false
28 31
29 32 
   # Tell Action Mailer not to deliver emails to the real world.
30 33 
   # The :test delivery method accumulates sent emails in the
 
@@ -36,9 +39,6 @@ Huginn::Application.configure do
36 39 
   # Raise exception for unpermitted parameters
37 40 
   config.action_controller.action_on_unpermitted_parameters = :raise
38 41
39 
-  # Randomize the order test cases are executed.
40 
-  config.active_support.test_order = :random
41 
-
42 42 
   # Print deprecation notices to the stderr
43 43 
   config.active_support.deprecation = :stderr
44 44

+ 5 - 0
config/initializers/cookies_serializer.rb
View File 

@@ -0,0 +1,5 @@
1 
+# Be sure to restart your server when you modify this file.
2 
+
3 
+# Specify a serializer for the signed and encrypted cookie jars.
4 
+# Valid options are :json, :marshal, and :hybrid.
5 
+Rails.application.config.action_dispatch.cookies_serializer = :hybrid

+ 24 - 0
config/initializers/new_framework_defaults.rb
View File 

@@ -0,0 +1,24 @@
1 
+# Be sure to restart your server when you modify this file.
2 
+#
3 
+# This file contains migration options to ease your Rails 5.0 upgrade.
4 
+#
5 
+# Read the Rails 5.0 release notes for more info on each option.
6 
+
7 
+# Enable per-form CSRF tokens. Previous versions had false.
8 
+Rails.application.config.action_controller.per_form_csrf_tokens = true
9 
+
10 
+# Enable origin-checking CSRF mitigation. Previous versions had false.
11 
+Rails.application.config.action_controller.forgery_protection_origin_check = true
12 
+
13 
+# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
14 
+# Previous versions had false.
15 
+ActiveSupport.to_time_preserves_timezone = true
16 
+
17 
+# Require `belongs_to` associations by default. Previous versions had false.
18 
+Rails.application.config.active_record.belongs_to_required_by_default = true
19 
+
20 
+# Do not halt callback chains when a callback returns false. Previous versions had true.
21 
+ActiveSupport.halt_callback_chains_on_return_false = false
22 
+
23 
+# Configure SSL options to enable HSTS with subdomains. Previous versions had false.
24 
+Rails.application.config.ssl_options = { hsts: { subdomains: true } }

+ 1 - 1
config/initializers/wrap_parameters.rb
View File 

@@ -5,7 +5,7 @@
5 5
6 6 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
7 7 
 ActiveSupport.on_load(:action_controller) do
8 
-  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
8 
+  wrap_parameters format: [:json]
9 9 
 end
10 10
11 11 
 # To enable root element in JSON for ActiveRecord objects.

+ 6 - 0
config/spring.rb
View File 

@@ -0,0 +1,6 @@
1 
+%w(
2 
+  .ruby-version
3 
+  .rbenv-vars
4 
+  tmp/restart.txt
5 
+  tmp/caching-dev.txt
6 
+).each { |path| Spring.watch(path) }